Adwaita: clean calendar styling

remove some non working props and generally simplify and clean up
the code, in the process address:

https://bugzilla.gnome.org/show_bug.cgi?id=769003

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index b898cd33d0e2a961a20bc0363dfe8f253b6193d8..6181fc418db1ac41f0214f0799f5bb713716c409 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3518,10 +3518,9 @@ calendar {
   }
 
   &.header {
-    border-bottom: 1px solid transparentize(black, 0.9);
-    border-radius: 0;
+    border-bottom-color: transparentize(black, 0.9);
 
-    &:backdrop { border-color: transparentize(black, 0.9); }
+    &:backdrop { border-bottom-color: transparentize(black, 0.9); }
   }
 
   &.button {
@@ -3529,39 +3528,25 @@ calendar {
 
     color: transparentize($fg_color, 0.55);
 
-    &:hover {
-      @extend %undecorated_button;
-
-      color: $fg_color;
-    }
-
-    &:backdrop {
-      @extend %undecorated_button;
-
-      color: transparentize($backdrop_fg_color,0.55);
-    }
+    &:hover { color: $fg_color; }
 
-    &:disabled {
-      @extend %undecorated_button;
+    &:backdrop { color: transparentize($backdrop_fg_color,0.55); }
 
-      color:  transparentize($insensitive_fg_color,0.55);
-    }
+    &:disabled { color:  transparentize($insensitive_fg_color,0.55); }
   }
 
-  &:indeterminate,
-  &:indeterminate:backdrop { color: gtkalpha(currentColor, 0.55); }
+  &.highlight {
+    color: $insensitive_fg_color;
 
-  &.highlight,
-  &.highlight:backdrop {
-    font-size: smaller;
-    color: $fg_color;
+    &:backdrop { color: $backdrop_insensitive_color; }
   }
 
-
   &:backdrop {
     color: $backdrop_text_color;
     border-color: $backdrop_borders_color;
   }
+
+  &:indeterminate { color: gtkalpha(currentColor, 0.3); }
 }
 
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index ad265d2a2ecd406f0cd1e4aa859fa2bf47795933..294abd204cf31a1a87175149f25f095e8a12dc4c 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1343,7 +1343,7 @@ modelbutton.flat,
 button:visited, button:link:hover, button:link:active, button:link:checked,
 button:visited:hover,
 button:visited:active,
-button:visited:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
+button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
   background-color: transparent;
   background-image: none;
   border-color: transparent;
@@ -4013,10 +4013,9 @@ calendar {
   calendar:selected {
     border-radius: 3px; }
   calendar.header {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0; }
+    border-bottom-color: rgba(0, 0, 0, 0.1); }
     calendar.header:backdrop {
-      border-color: rgba(0, 0, 0, 0.1); }
+      border-bottom-color: rgba(0, 0, 0, 0.1); }
   calendar.button {
     color: rgba(238, 238, 236, 0.45); }
     calendar.button:hover {
@@ -4025,14 +4024,15 @@ calendar {
       color: rgba(145, 148, 148, 0.45); }
     calendar.button:disabled {
       color: rgba(145, 148, 148, 0.45); }
-  calendar:indeterminate, calendar:indeterminate:backdrop {
-    color: alpha(currentColor,0.55); }
-  calendar.highlight, calendar.highlight:backdrop {
-    font-size: smaller;
-    color: #eeeeec; }
+  calendar.highlight {
+    color: #919494; }
+    calendar.highlight:backdrop {
+      color: #566164; }
   calendar:backdrop {
     color: #d3d4d5;
     border-color: #202425; }
+  calendar:indeterminate {
+    color: alpha(currentColor,0.3); }
 
 /***********
  * Dialogs *

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 243cf3575a79a7ac6b4999a8281345eb56190ff6..1c136be1002c2f03b7b498e678aaba4859f72f43 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1346,7 +1346,7 @@ modelbutton.flat,
 button:visited, button:link:hover, button:link:active, button:link:checked,
 button:visited:hover,
 button:visited:active,
-button:visited:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
+button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
   background-color: transparent;
   background-image: none;
   border-color: transparent;
@@ -4044,10 +4044,9 @@ calendar {
   calendar:selected {
     border-radius: 3px; }
   calendar.header {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0; }
+    border-bottom-color: rgba(0, 0, 0, 0.1); }
     calendar.header:backdrop {
-      border-color: rgba(0, 0, 0, 0.1); }
+      border-bottom-color: rgba(0, 0, 0, 0.1); }
   calendar.button {
     color: rgba(46, 52, 54, 0.45); }
     calendar.button:hover {
@@ -4056,14 +4055,15 @@ calendar {
       color: rgba(139, 142, 143, 0.45); }
     calendar.button:disabled {
       color: rgba(139, 142, 143, 0.45); }
-  calendar:indeterminate, calendar:indeterminate:backdrop {
-    color: alpha(currentColor,0.55); }
-  calendar.highlight, calendar.highlight:backdrop {
-    font-size: smaller;
-    color: #2e3436; }
+  calendar.highlight {
+    color: #8b8e8f; }
+    calendar.highlight:backdrop {
+      color: #c3c3c0; }
   calendar:backdrop {
     color: #323232;
     border-color: #c0c0bd; }
+  calendar:indeterminate {
+    color: alpha(currentColor,0.3); }
 
 /***********
  * Dialogs *